首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0

浏览代码
添加备注，支持自定义模板消息备注

FFIB 4 年之前
父节点
1acd49116b
当前提交
5444cf4170
共有 3 个文件被更改，包括 37 次插入 和 6 次删除
显示文件统计
  1. 10 6
      api/admin_views.py
  2. 20 0
      member/migrations/0027_goodsorderinfo_remark.py
  3. 7 0
      member/models.py

+ 10 - 6
api/admin_views.py
查看文件 

@@ -816,6 +816,7 @@ def member_goods_order_update(request):
816 816 
     admin_id = request.POST.get('admin_id', '')
817 817 
     order_id = request.POST.get('order_id', '')
818 818 
     tracking_number = request.POST.get('tracking_number', '')
819 
+    remark = request.POST.get('remark', u'您的礼品正在快马加鞭赶来，请耐心等待呦~')
819 820
820 821 
     if brand_id != settings.KODO_DEFAULT_BRAND_ID:
821 822 
         return response(ProductBrandStatusCode.BRAND_NOT_MATCH)
 
@@ -825,7 +826,7 @@ def member_goods_order_update(request):
825 826 
     except AdministratorInfo.DoesNotExist:
826 827 
         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
827 828
828 
-    if not send_trackingNumber_message(order_id, tracking_number):
829 
+    if not send_trackingNumber_message(order_id, tracking_number, remark):
829 830 
         return response(400001, 'Member Goods Order Update Failure', u'会员商品订单修改失败')
830 831
831 832 
     return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')
 
@@ -843,11 +844,12 @@ def member_goods_order_batch_update(request):
843 844 
         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
844 845 
     except AdministratorInfo.DoesNotExist:
845 846 
         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
846 
-
847 
+
847 848 
     err_orders = []
848 849 
     for order in orders:
849 
-        if not send_trackingNumber_message(order['order_id'], order['tracking_number']):
850 
-            err_orders.append(order['order_id'])
850 
+        print order
851 
+        if not send_trackingNumber_message(order.get('order_id', ''), order.get('tracking_number', ''), order.get('remark', u'您的礼品正在快马加鞭赶来，请耐心等待呦~')):
852 
+            err_orders.append(order.get('order_id', ''))
851 853
852 854 
     if err_orders:
853 855 
         return response(40001, 'Member Goods Order Update Error', u'部分会员商品订单修改失败', data={
 
@@ -856,12 +858,14 @@ def member_goods_order_batch_update(request):
856 858
857 859 
     return response(200, 'Member Goods Order Update Success', u'会员商品订单修改成功')
858 860
859 
-def send_trackingNumber_message(order_id, tracking_number):
861 
+def send_trackingNumber_message(order_id, tracking_number, remark):
860 862 
     try:
861 863 
         order = GoodsOrderInfo.objects.get(order_id=order_id, status=True)
864 
+        order.remark = remark
862 865 
         order.tracking_number = tracking_number
863 866 
         if tracking_number and order.good_type == GoodsInfo.PHYSICAL and not order.has_send_template_message:
864 867 
             order.has_send_template_message = True
868 
+
865 869
866 870 
             # 校验用户是否存在
867 871 
             user = UserInfo.objects.get(user_id=order.user_id)
 
@@ -880,7 +884,7 @@ def send_trackingNumber_message(order_id, tracking_number):
880 884 
                     "color": "#173177"
881 885 
                 },
882 886 
                 "thing5": {
883 
-                    "value": u"您的礼品正在快马加鞭赶来，请耐心等待呦~",
887 
+                    "value": order.remark,
884 888 
                     "color": "#173177"
885 889 
                 },
886 890 
             }

+ 20 - 0
member/migrations/0027_goodsorderinfo_remark.py
查看文件 

@@ -0,0 +1,20 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.26 on 2021-01-13 08:25
3 
+from __future__ import unicode_literals
4 
+
5 
+from django.db import migrations, models
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('member', '0026_goodsorderinfo_send_template_message_res'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AddField(
16 
+            model_name='goodsorderinfo',
17 
+            name='remark',
18 
+            field=models.CharField(blank=True, help_text='\u5907\u6ce8', max_length=255, null=True, verbose_name='remark'),
19 
+        ),
20 
+    ]

+ 7 - 0
member/models.py
查看文件 

@@ -1,5 +1,7 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 
+import json
4 
+
3 5 
 from django.db import models
4 6 
 from django.utils.translation import ugettext_lazy as _
5 7 
 from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, upload_path
 
@@ -178,6 +180,8 @@ class GoodsOrderInfo(BaseModelMixin):
178 180
179 181 
     send_template_message_res = JSONField(_(u'send_template_message_res'), blank=True, null=True, help_text=u'send_template_message_res')
180 182
183 
+    remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
184 
+
181 185 
     class Meta:
182 186 
         verbose_name = _(u'会员商品订单信息')
183 187 
         verbose_name_plural = _(u'会员商品订单信息')
 
@@ -188,6 +192,7 @@ class GoodsOrderInfo(BaseModelMixin):
188 192 
     @property
189 193 
     def admindata(self):
190 194 
         good = GoodsInfo.objects.get(good_id=self.good_id)
195 
+        print self.send_template_message_res
191 196 
         return {
192 197 
             'order_id': self.order_id,
193 198 
             'good_id': self.good_id,
 
@@ -200,6 +205,8 @@ class GoodsOrderInfo(BaseModelMixin):
200 205 
             'tracking_number': self.tracking_number,
201 206 
             'integral': self.integral,
202 207 
             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M:%S'),
208 
+            'send_template_message_res': json.loads(self.send_template_message_res) if self.send_template_message_res else '',
209 
+            'remark': self.remark
203 210 
         }
204 211
205 212